From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 24 Nov 2009 08:37:40 +0000 (+0000)
Subject: (x_new_font): Update f->scroll_bar_actual_width.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9285
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d71ebc065b6d32931b59ae14f883bb97a06404c9;p=emacs.git

(x_new_font): Update f->scroll_bar_actual_width.
---

diff --git a/src/xterm.c b/src/xterm.c
index aefa9d7217b..94093bd3848 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8070,6 +8070,10 @@ x_new_font (f, font_object, fontset)
           pixelh -= FRAME_MENUBAR_HEIGHT (f);
 #endif
           rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh);
+	  /* Update f->scroll_bar_actual_width because it is used in
+	     FRAME_PIXEL_WIDTH_TO_TEXT_COLS.  */
+	  f->scroll_bar_actual_width
+	    = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f);
           cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f));
           
           change_frame_size (f, rows, cols, 0, 1, 0);